build: Set no_undefined in Makefile.decl

This simplifies the code and - more importantly - fixes the cases like
in testsuite/reftests where the no_undefined definition was missing.

https://bugzilla.gnome.org/show_bug.cgi?id=736382

diff --git a/Makefile.decl b/Makefile.decl
index 901b64b172444d9bd1af6b701c1989095bb29901..4bc7784b60d419f10555e062637c1fea1821bd46 100644 (file)
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -26,6 +26,10 @@ SKIP_GDKTARGET = \
        echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
 endif
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
 XVFB_START = \
        ${XVFB} -help 2>/dev/null 1>&2 \
        && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index e3860a972d99cdd26b893b567fad387858ec572d..5f0c1e5d0aa99ee98b78c87fbb4fda59adb88a20 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -42,10 +42,6 @@ AM_CPPFLAGS =                                \
        $(GTK_DEBUG_FLAGS)              \
        $(GDK_DEP_CFLAGS)
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 # libtool stuff: set version and export symbols for resolving
 # since automake doesn't support conditionalized libsomething_la_LDFLAGS
 # we use the general approach here

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2ec3cd2957a65a1f8fc2d182b5081984217869d7..17ca61429275640b4c7d5993faf847f211ee4a19 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -79,10 +79,6 @@ AM_CPPFLAGS =                                                \
        $(GTK_DEP_CFLAGS)                               \
        $(INCLUDED_IMMODULE_DEFINE)
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 if OS_WIN32
 gtk_def = gtk.def
 gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def

diff --git a/libgail-util/Makefile.am b/libgail-util/Makefile.am
index 9422f8a27ea02867a23ab44432431cb1e85067eb..8ac0264a9d0384c9fc5863fc927f4e768d84f833 100644 (file)
--- a/libgail-util/Makefile.am
+++ b/libgail-util/Makefile.am
@@ -1,9 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
 EXTRA_DIST += gailutil.def
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
 if OS_WIN32
 export_symbols = -export-symbols $(srcdir)/gailutil.def
 gailutil.def: libgailutil-3.la

diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 44df55f509f360951952ac1b106400f3b6227a3f..519be8e84aeaa993cbdcae805012d83d4bd96f3f 100644 (file)
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -1,10 +1,6 @@
 ## Makefile.am for gtk+/modules/input
 include $(top_srcdir)/Makefile.decl
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
        -I$(top_srcdir)/gdk             \

diff --git a/modules/printbackends/cloudprint/Makefile.am b/modules/printbackends/cloudprint/Makefile.am
index 6408d4cbbfacf6872a8e2e47dac1f79c92c6229d..d2d434fec3e94774b3bb963c42f88c94292b84e8 100644 (file)
--- a/modules/printbackends/cloudprint/Makefile.am
+++ b/modules/printbackends/cloudprint/Makefile.am
@@ -1,9 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-cloudprint.la

diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am
index 33520bea48fafc8cf41a43fc285aeb10be679fb2..09a9f893cfd6056c3fc5208d3f80d8a45ed028e9 100644 (file)
--- a/modules/printbackends/cups/Makefile.am
+++ b/modules/printbackends/cups/Makefile.am
@@ -1,9 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 AM_CPPFLAGS = \
        -I$(top_srcdir)                                 \
        -I$(top_srcdir)/gtk                             \

diff --git a/modules/printbackends/file/Makefile.am b/modules/printbackends/file/Makefile.am
index c0189f10a764f7366efa352a9457902ce44894c4..9b51bf4e12a1a80d847e0f3280418b03baf6f382 100644 (file)
--- a/modules/printbackends/file/Makefile.am
+++ b/modules/printbackends/file/Makefile.am
@@ -1,9 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-file.la

diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am
index ff51351d3d9d5c872a6ccf4a37c2b7c9e475d208..5a7517009e7a0586c42ee8397229d68ef13ee42b 100644 (file)
--- a/modules/printbackends/lpr/Makefile.am
+++ b/modules/printbackends/lpr/Makefile.am
@@ -1,9 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 AM_CPPFLAGS = \
        -I$(top_srcdir)                                 \
        -I$(top_srcdir)/gtk                             \

diff --git a/modules/printbackends/papi/Makefile.am b/modules/printbackends/papi/Makefile.am
index 5388baa3a359389cd14a883c1aa43f814f600f4f..7176eba2ddf5cd2bb1fb32c1ce7f3dda81103aa6 100644 (file)
--- a/modules/printbackends/papi/Makefile.am
+++ b/modules/printbackends/papi/Makefile.am
@@ -1,6 +1,4 @@
-if OS_WIN32
-no_undefined = -no-undefined
-endif
+include $(top_srcdir)/Makefile.decl
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)                                 \

diff --git a/modules/printbackends/test/Makefile.am b/modules/printbackends/test/Makefile.am
index 69b3ff1ba6d948215b4166ee758283fec9ce6ed2..bff5e93c7ae6ee1d4195f053ccaa7255a1aafcd9 100644 (file)
--- a/modules/printbackends/test/Makefile.am
+++ b/modules/printbackends/test/Makefile.am
@@ -1,9 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-test.la